menus: Use gtk_widget_measure to measure widget sizes

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 105f98d70d3402072abee1fea1e762000b7ff813..2a87460e21459728082f3634c1c0a03a02bec4a9 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2771,8 +2771,10 @@ calculate_line_heights (GtkMenu *menu,
 
       part = avail_width / (r - l);
 
-      gtk_widget_get_preferred_height_for_width (child, part,
-                                                 &child_min, &child_nat);
+      gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL,
+                          part,
+                          &child_min, &child_nat,
+                          NULL, NULL);
 
       gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size);
 
@@ -3028,7 +3030,8 @@ static void gtk_menu_measure (GtkWidget      *widget,
            * case the toggle size request depends on the size
            * request of a child of the child (e.g. for ImageMenuItem)
            */
-           gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+           gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL,
+                               -1, &child_min, &child_nat, NULL, NULL);
 
            gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size);
            max_toggle_size = MAX (max_toggle_size, toggle_size);

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 2d9439cea6dd5eb0c00a077873a42d27c2c1d87f..d7470fcb442e8e00e7d760257280eef3f7f45442 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -454,10 +454,10 @@ gtk_menu_bar_allocate (GtkCssGadget        *gadget,
             continue;
 
           request.data = child;
-          gtk_widget_get_preferred_width_for_height (child, 
-                                                     remaining_space.height,
-                                                     &request.minimum_size, 
-                                                     &request.natural_size);
+          gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL,
+                              remaining_space.height,
+                              &request.minimum_size, &request.natural_size,
+                              NULL, NULL);
           gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
                                              &toggle_size);
           request.minimum_size += toggle_size;
@@ -508,10 +508,10 @@ gtk_menu_bar_allocate (GtkCssGadget        *gadget,
             continue;
 
           request.data = child;
-          gtk_widget_get_preferred_height_for_width (child, 
-                                                     remaining_space.width,
-                                                     &request.minimum_size, 
-                                                     &request.natural_size);
+          gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL,
+                              remaining_space.width,
+                              &request.minimum_size, &request.natural_size,
+                              NULL, NULL);
           gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
                                              &toggle_size);
           request.minimum_size += toggle_size;

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 16a6e16b71b2c939de94a03e21abe04b3ea4e647..ab780fcf4b727acc8b415f0ec9cbe9eca63366e5 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -444,7 +444,8 @@ gtk_menu_item_real_get_width (GtkWidget *widget,
     {
       gint child_min, child_nat;
 
-      gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+      gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1,
+                          &child_min, &child_nat, NULL, NULL);
 
       if ((priv->submenu && !GTK_IS_MENU_BAR (parent)) || priv->reserve_indicator)
        {
@@ -511,14 +512,17 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
       if (for_size != -1)
         {
           avail_size -= arrow_size;
-          gtk_widget_get_preferred_height_for_width (child,
-                                                     avail_size,
-                                                     &child_min,
-                                                     &child_nat);
+          gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL,
+                              avail_size,
+                              &child_min, &child_nat,
+                              NULL, NULL);
         }
       else
         {
-          gtk_widget_get_preferred_height (child, &child_min, &child_nat);
+          gtk_widget_measure (child, GTK_ORIENTATION_VERTICAL, -1,
+                              &child_min, &child_nat,
+                              NULL, NULL);
+
         }
 
       min_height += child_min;